- 08 Mar, 2015 3 commits
-
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
- 07 Mar, 2015 17 commits
-
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Reduce amount of custom css and increase usage of default bootstrap * Copy variables template file for configuring bootstrap variables * Move layout and bootstrap to `base/` directory and explicitly set import order * Apply some styles from flatly theme * Replace bs-callout with alert * Refactor gitlab css state colors * Cleanup css variables * Remove custom css for panels and navs See merge request !1651
-
Dmitriy Zaporozhets authored
-
Robert Schilling authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Robert Schilling authored
Fix editor in IE producing errors #1096 IE seems to handle form submission oddly. It gets fired twice - once from javascript and once from the form click, producing 2 identical requests and causing #1096. Similar issues: http://stackoverflow.com/questions/14373800 Returning false from the click event seems to fix it and shouldn't cause any side-effects. See merge request !366
-
Robert Schilling authored
use constant-time string compare for internal api authentication
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Send notifications and leave system comments when bulk updating issues. Resolves https://dev.gitlab.org/gitlab/gitlabhq/issues/1885. See merge request !1646
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Condense commits already in target branch when updating merge request source branch. Resolves https://dev.gitlab.org/gitlab/gitlabhq/issues/2043. ![Screen_Shot_2015-03-06_at_17.17.13](https://dev.gitlab.org/gitlab/gitlabhq/uploads/8d03540b7b7294ce07005e6f3db6ed3d/Screen_Shot_2015-03-06_at_17.17.13.png) (Not shown in screenshot, but works fine with rebases as well) See merge request !1648
-
- 06 Mar, 2015 12 commits
-
-
Douwe Maan authored
-
Douwe Maan authored
Add tag push notifications to HipChat and Slack messages and normalize output of messages to be consistent Add tag_push event notification to HipChat and Slack services. For each service, normalize message output to use: - User name instead of username - Include first line of title in message description - Link to "Issue #X" instead of "#X" See merge request !370
-
Jörg Thalheim authored
Ruby str_equal uses memcmp internally to compare String. Memcmp is vunerable to timing attacks because it returns early on mismatch (on most x32 platforms memcmp uses a bytewise comparision). Devise.secure_compare implements a constant time comparision instead.
-
Douwe Maan authored
-
Stan Hu authored
Normalize output to use: - User name instead of username - Include first line of title in message description - Link to "Issue #X" instead of "#X"
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Use bootstrap buttons with custom colors instead of own css Reduce amount of custom css will make UI development easier See merge request !1641
-
Douwe Maan authored
Add notes notifications to services This merge request builds on top of a few other merge requests: * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/237 * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/350 The purpose of this merge request is to add service notification support when a user comments on one of the following: * commits * issues * merge requests * code snippets Currently HipChat and Slack are only supported. The admin can select which events to toggle on or off. ## Questions All note events are bundled under the `note` event type. Is this okay, or does it make more sense to have individual events and/or change the `object_type` attribute in the hook data? Also, does it look better to link the entire `merge request #X` as opposed to just `#X`? I like the former. ## Before ![Screen Shot 2015-03-01 at 3.05.56 PM](https://gitlab.com/uploads/stanhu/gitlab-ce/8ae828e652/Screen_Shot_2015-03-01_at_3.05.56_PM.png) ## After ![Screen Shot 2015-03-06 at 6.24.40 AM](https://gitlab.com/uploads/gitlab-org/gitlab-ce/7b866ae02b/Screen_Shot_2015-03-06_at_6.24.40_AM.png) ### Slack ![Screen Shot 2015-03-01 at 2.59.00 PM](https://gitlab.com/uploads/stanhu/gitlab-ce/0147c2dc38/Screen_Shot_2015-03-01_at_2.59.00_PM.png) ### HipChat ![Screen Shot 2015-03-01 at 2.59.19 PM](https://gitlab.com/uploads/stanhu/gitlab-ce/14e78fc61c/Screen_Shot_2015-03-01_at_2.59.19_PM.png) See merge request !358
-
Stan Hu authored
Supports four different event types all bundled under the "note" event type: - comments on a commit - comments on an issue - comments on a merge request - comments on a code snippet
-
Douwe Maan authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
- 05 Mar, 2015 8 commits
-
-
Dmitriy Zaporozhets authored
Bump gitlab_git to fix 500 with annotated tags w/o message Should fix https://gitlab.com/gitlab-org/gitlab-ce/issues/1181 See merge request !1640
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Cache project row on dashboard, group and user page See merge request !1639
-
Dmitriy Zaporozhets authored
-
Robert Schilling authored
Update gemnasium-gitlab-service gem
-
Douwe Maan authored
Add merge and issue event notification for HipChat This adds merge and issue event notification for HipChat. This depends on the MR used for Slack: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/237 This should also address #1085. Before: ![Screen Shot 2015-02-23 at 8.55.08 AM](https://gitlab.com/uploads/gitlab-org/gitlab-ce/6123e3251b/Screen_Shot_2015-02-23_at_8.55.08_AM.png) After: ![Screen Shot 2015-02-23 at 8.54.22 AM](https://gitlab.com/uploads/gitlab-org/gitlab-ce/19eabc8bf6/Screen_Shot_2015-02-23_at_8.54.22_AM.png) ![Screen Shot 2015-02-23 at 9.25.51 PM](https://gitlab.com/uploads/gitlab-org/gitlab-ce/0ea6229ddc/Screen_Shot_2015-02-23_at_9.25.51_PM.png) See merge request !350
-
Dmitriy Zaporozhets authored
Fix checkbox alignment in application settings Add the form-control CSS class to the feature checkboxes on the application settings page to fix the vertical alignment with their labels. See #2053. Also add aria-describedby attributes to form controls that have a help text block (http://getbootstrap.com/css/#callout-help-text-accessibility). ## Before ![Admin_area___GitLab](https://dev.gitlab.org/Okada/gitlabhq/uploads/2736fe81ba564b43cbef37cd187cf47a/Admin_area___GitLab.png) --- ## After ![Admin_area___GitLab_-_after](https://dev.gitlab.org/Okada/gitlabhq/uploads/95a8a26600458c9c55bc05d2e0c6be47/Admin_area___GitLab_-_after.png) --- This doesn't address the help text block for the twitter checkbox. @dzaporozhets Do you want to keep the help text visible or would you rather put it in a dialog and hide it initially? cc @sytse See merge request !1615
-