summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | Send EmailsOnPush when deleting commits using force push.Douwe Maan2015-02-255-8/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #1924.
| * | | | | | | | | | | | | | Wrap commit message in EmailsOnPush email.Douwe Maan2015-02-252-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #1867.
| * | | | | | | | | | | | | | Fix links in EmailsOnPush text version.Douwe Maan2015-02-251-2/+5
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add option to disable code diffs to EmailOnPush.Douwe Maan2015-02-257-42/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #1950
| * | | | | | | | | | | | | | Add option to send EmailsOnPush from committer email if domain matches.Douwe Maan2015-02-257-10/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #1809.
| * | | | | | | | | | | | | | Add optional title field to service properties.Douwe Maan2015-02-252-2/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add list of changed files to EmailsOnPush.Douwe Maan2015-02-254-14/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #1906.
| * | | | | | | | | | | | | | Remove incorrect footer from EmailsOnPush body.Douwe Maan2015-02-253-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #1754.
| * | | | | | | | | | | | | | Change EmailsOnPush subject to include namespace, repo and branch.Douwe Maan2015-02-252-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #1827.
* | | | | | | | | | | | | | | Merge branch 'webstorage-exception' into 'master'Dmitriy Zaporozhets2015-03-082-3/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly handle autosave local storage exceptions. Addresses https://gitlab.com/gitlab-org/gitlab-ce/issues/1182. See merge request !1643
| * | | | | | | | | | | | | | | Properly handle autosave local storage exceptions.Douwe Maan2015-03-072-3/+10
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'fix-milestone-list-width' into 'master'Dmitriy Zaporozhets2015-03-084-1/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix width of text in milestone lists and add assignee icon to merge requests. Before: ![Screen_Shot_2015-03-06_at_13.48.00](https://dev.gitlab.org/gitlab/gitlabhq/uploads/5754638a3ebb79dee1f6c07a6e268035/Screen_Shot_2015-03-06_at_13.48.00.png) After: ![Screen_Shot_2015-03-06_at_13.48.14](https://dev.gitlab.org/gitlab/gitlabhq/uploads/fe92adf387964efb3d460dfc61ced3b8/Screen_Shot_2015-03-06_at_13.48.14.png) I've checked with other screen widths as well, and it looks good all the time. See merge request !1645
| * | | | | | | | | | | | | | | Add assignee icon to milestone merge requests.Douwe Maan2015-03-063-0/+16
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix width of text in milestone lists.Douwe Maan2015-03-061-1/+1
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'commit-range-reference' into 'master'Dmitriy Zaporozhets2015-03-085-4/+108
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically link commit ranges to compare page. Closes #2103 Implemented as proposed in the last paragraph of the issue: > We could do something similar to Ruby, where `1..5` means `1,2,3,4,5` and `1...5` means `1,2,3,4`: `..` means inclusive, `...` means exclusive. In our case, `sha1...sha4` would mean `sha2,sha3,sha4` (exclusive with regards to `sha1`) and `sha1..sha4` would mean `sha1^...sha4`, i.e. `sha1,sha2,sha3,sha4` (inclusive to `sha1`). - `sha1...sha4` now links to `compare/sha1...sha4` - `sha1..sha4` now links to `compare/sha1^...sha4`. See merge request !1649
| * | | | | | | | | | | | | | | Automatically link commit ranges to compare page.Douwe Maan2015-03-075-4/+108
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |