summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Add DevKit and development README links to CONTRIBUTING.mdDmitriy Zaporozhets2015-03-081-0/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'dev-ui' into 'master'Dmitriy Zaporozhets2015-03-088-15/+246
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab UI development kit and UI guide help section Page with UI elements get generated from current css so you can immediately check how your css changes affects common ui elements. Because it requires GitLab runnning I cannot put it to documentation so I just put link to localhost from development section cc @developers @sabba @sytse See merge request !1653
| * | | | | | | | | | | | | Add markdown info to UI dev kit pageDmitriy Zaporozhets2015-03-081-0/+16
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge two css files with same nameDmitriy Zaporozhets2015-03-082-9/+10
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add UI guide to GitLab development helpDmitriy Zaporozhets2015-03-082-0/+13
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add GitLab UI development kitDmitriy Zaporozhets2015-03-084-6/+207
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'mobile-improvements' into 'master'Dmitriy Zaporozhets2015-03-082-8/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mobile improvements for user page * hide calendar on small screens * hide sidebar and show button to toggle it Fixes #2101 See merge request !1652
| * | | | | | | | | | | | | Prevent date overflow on issue page on mobile devicesDmitriy Zaporozhets2015-03-081-2/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Hide user page sidebar for mobilde devicesDmitriy Zaporozhets2015-03-081-6/+9
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-073-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceRobert Schilling2015-03-072-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'master'Robert Schilling2015-03-072-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | | | | | | | | Bugfix #1096unknown2015-03-042-2/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #8928 from Mic92/masterRobert Schilling2015-03-071-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | use constant-time string compare for internal api authentication
| | * | | | | | | | | | | | | use constant-time string compare for internal api authenticationJörg Thalheim2015-03-061-1/+4
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | | | | Merge branch 'css-cleanup' into 'master'Dmitriy Zaporozhets2015-03-0768-367/+993
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | Small UI improvements after css refactoringDmitriy Zaporozhets2015-03-079-19/+15
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Increase input padding and fit issue form in laptop screenDmitriy Zaporozhets2015-03-077-11/+16
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Move mixins and bootstrap css to base directoryDmitriy Zaporozhets2015-03-076-3/+7
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Apply some styles from flatly themeDmitriy Zaporozhets2015-03-077-45/+37
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Better name for pages css dirDmitriy Zaporozhets2015-03-0636-4/+7
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove custom css for panels and navsDmitriy Zaporozhets2015-03-064-72/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Cleanup css variablesDmitriy Zaporozhets2015-03-069-139/+882
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Refactor gitlab css state colorsDmitriy Zaporozhets2015-03-0613-68/+65
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Replace bs-callout with alertDmitriy Zaporozhets2015-03-0614-60/+14
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'mass-change-comments' into 'master'Dmitriy Zaporozhets2015-03-075-46/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send notifications and leave system comments when bulk updating issues. Resolves https://dev.gitlab.org/gitlab/gitlabhq/issues/1885. See merge request !1646
| * | | | | | | | | | | | | Send notifications and leave system comments when bulk updating issues.Douwe Maan2015-03-065-46/+33
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-0612-64/+134
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'normalize-slack-hipchat-messages' into 'master'Douwe Maan2015-03-0612-64/+134
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | | Add tag_push event notification to HipChat and Slack services.Stan Hu2015-03-0612-64/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normalize output to use: - User name instead of username - Include first line of title in message description - Link to "Issue #X" instead of "#X"
* | | | | | | | | | | | | | | Merge branch 'condensed-mr-commits' into 'master'Dmitriy Zaporozhets2015-03-074-6/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | Use 2 periods instead of 3 to signify inclusive range.Douwe Maan2015-03-061-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Condense commits already in target branch when updating merge request source ↵Douwe Maan2015-03-064-6/+36
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | branch.
* | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-0635-19/+736
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'add-notes-notifications-to-services' into 'master'Douwe Maan2015-03-0635-19/+736
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | Added comment notification events to HipChat and Slack services.Stan Hu2015-03-0635-19/+736
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | Merge branch 'bootstrap-btns' into 'master'Dmitriy Zaporozhets2015-03-062-114/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use bootstrap buttons with custom colors instead of own css Reduce amount of custom css will make UI development easier See merge request !1641
| * | | | | | | | | | | | Use bootstrap buttons with custom colors instead of own cssDmitriy Zaporozhets2015-03-062-114/+14
|/ / / / / / / / / / / /
* | | | | | | | | | | | Fix bug with active tab remembering (saving cookie with different path)Dmitriy Zaporozhets2015-03-061-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'bump_gitlab_git' into 'master'Dmitriy Zaporozhets2015-03-052-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | Bump gitlab_git to fix 500 with annotated tags w/o messageDmitriy Zaporozhets2015-03-052-3/+3
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-053-5/+185
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'add-more-hipchat-notifications' into 'master'Douwe Maan2015-03-053-5/+185
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | Add merge and issue event notification for HipChatStan Hu2015-03-053-5/+185
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #8915 from gemnasium/update-gemnasium-to-0-2-5Robert Schilling2015-03-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | Update gemnasium-gitlab-service gem
| | * | | | | | | | | | | | | Update gemnasium-gitlab-service gemfabien2015-03-041-1/+1
| | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'cache-project-row' into 'master'Dmitriy Zaporozhets2015-03-051-20/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache project row on dashboard, group and user page See merge request !1639
| * | | | | | | | | | | | | | Cache project row on dashboard, group and user pageDmitriy Zaporozhets2015-03-051-20/+21
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'fix-checkbox-align' into 'master'Dmitriy Zaporozhets2015-03-052-15/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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