summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Create and edit files in web editor via ruggedDmitriy Zaporozhets2015-06-015-17/+62
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'refactor-header' into 'master'Dmitriy Zaporozhets2015-06-0115-200/+169
|\ | | | | | | | | | | | | | | | | | | | | | | | | Refactor header css/html * Fixes UI issue with header on zoom * Replace duplicate numbers with variable * Better names for css classes * refactor header views Fixes #1640 See merge request !750
| * improve navbar collapse for mobile viewsDmitriy Zaporozhets2015-06-013-13/+10
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix header overflow for big titleDmitriy Zaporozhets2015-06-012-23/+6
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Refactor header viewsDmitriy Zaporozhets2015-06-017-27/+18
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * More fixes to header cssDmitriy Zaporozhets2015-06-016-9/+7
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Refactor header css/htmlrefactor-headerDmitriy Zaporozhets2015-06-017-153/+153
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'linguist-comment' into 'master'Dmitriy Zaporozhets2015-06-011-0/+8
|\ | | | | | | | | | | | | | | | | | | Explain gitlab forks in Gemfile Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2358 See merge request !749
| * Add comments about gitlab forksDmitriy Zaporozhets2015-06-011-1/+5
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Exmplain gitlab-linguist fork existenceDmitriy Zaporozhets2015-06-011-0/+4
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Better margin for header in accept MR widgetDmitriy Zaporozhets2015-06-011-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Show avatars in merge widget and fix mr download button overflowDmitriy Zaporozhets2015-06-012-11/+10
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'disable-mr-source-branch-change' into 'master'Dmitriy Zaporozhets2015-06-015-8/+12
|\ | | | | | | | | | | | | | | Disable changing of the source branch in merge request update API As noted in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/738#note_1307284 See merge request !745
| * Disable changing of the source branch in merge request update APIStan Hu2015-05-295-8/+12
| |
* | Merge branch 'feature/sign_out_page' into 'master'Dmitriy Zaporozhets2015-06-017-2/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to configure a URL to show after sign out Split of !669 as requested This is especially useful with SAML ( !722 ) since the omniauth-saml gem does not support single log-out. This provides a way to log out the user from the SAML IdP after signing out from GitLab. See merge request !725
| * | Allow to configure a URL to show after sign outAlex Lossent2015-05-297-2/+20
| | |
* | | Improve UI for accept MR widgetDmitriy Zaporozhets2015-06-011-13/+7
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'master' into 'master'Robert Schilling2015-05-311-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | small typo See merge request !747
| * | | small typoTerrence Benade2015-05-311-1/+1
|/ / /
* | | Merge branch 'fix/saml_changelog' into 'master'Robert Schilling2015-05-291-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | Fix misplaced changelog entry for SAML support See merge request !746
| * | Fix misplaced changelog entry for SAML supportAlex Lossent2015-05-291-1/+1
| |/
* | Improve UI of project sidebarDmitriy Zaporozhets2015-05-293-9/+14
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'leave-project' into 'master'Dmitriy Zaporozhets2015-05-296-4/+35
|\ | | | | | | | | | | | | | | Add ability to leave project Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !744
| * Make leave buttons more explicitleave-projectDmitriy Zaporozhets2015-05-292-3/+5
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add changelog item about leave project featureDmitriy Zaporozhets2015-05-291-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add ability to leave projectDmitriy Zaporozhets2015-05-293-1/+29
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'support-edit-target-branch-in-mr' into 'master'Dmitriy Zaporozhets2015-05-2911-5/+104
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support editing target branch of merge request ### What does this MR do? This MR makes it possible to edit the target branch of a merge request and adds a system note when this happens. ### Why was this MR needed? Because lots of people requested this feature. :) ### Screenshots **Edit MR page** ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9b3d405bf7b5f945e35bae3534c2b67b/image.png) **New MR page** ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3657a2a9efad6d10e8470637d1166bdb/image.png) **System note** ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cc8066f3d3bdf09c0cce27193210567d/image.png) ### What are the relevant issue numbers? * Closes https://github.com/gitlabhq/gitlabhq/issues/7105 * See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130! See merge request !738
| * | Support editing target branch of merge requestStan Hu2015-05-2911-5/+104
| | | | | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/7105 See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130
* | | Merge branch 'user-oauth-applications' into 'master'Dmitriy Zaporozhets2015-05-299-29/+63
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add option to disallow users from registering any application to use GitLab as an OAuth provider Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2264. ![Screen_Shot_2015-05-29_at_13.30.11](https://gitlab.com/gitlab-org/gitlab-ce/uploads/300f8e9ecbeb3d353ebc33a63cdef4e9/Screen_Shot_2015-05-29_at_13.30.11.png) See merge request !742
| * | | Add option to disallow users from registering any application to use GitLab ↵user-oauth-applicationsDouwe Maan2015-05-299-29/+63
| | | | | | | | | | | | | | | | as an OAuth provider
* | | | Merge branch 'leave-group' into 'master'Dmitriy Zaporozhets2015-05-295-6/+15
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | User should be able to leave group. If not - show him proper message Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !743
| * | | Fix tests for group leave featureDmitriy Zaporozhets2015-05-292-1/+6
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | User should be able to leave group. If not - show him proper messageDmitriy Zaporozhets2015-05-293-5/+9
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-298-4/+109
|\ \ \ \
| * \ \ \ Merge branch 'mr-wip-text' into 'master'Dmitriy Zaporozhets2015-05-292-4/+5
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shorten merge request WIP text. ![Screen_Shot_2015-05-29_at_11.37.46](https://gitlab.com/gitlab-org/gitlab-ce/uploads/5853d9057103bdaacded17798378f68e/Screen_Shot_2015-05-29_at_11.37.46.png) ![Screen_Shot_2015-05-29_at_11.37.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/be96ee32ab5a8f23835dc37306259b17/Screen_Shot_2015-05-29_at_11.37.49.png) See merge request !741
| | * | | Shorten merge request WIP text.Douwe Maan2015-05-292-4/+5
| | | | |
| * | | | Merge branch 'feature/saml_support' into 'master'Douwe Maan2015-05-297-0/+104
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add SAML support via Omniauth Split of !669, with doc See merge request !722
| | * | | Add SAML support via OmniauthAlex Lossent2015-05-277-0/+104
| | | | |
* | | | | Style header search field on focusDmitriy Zaporozhets2015-05-291-0/+7
|/ / / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'rs-merge-request-tabs-the-third' into 'master'Dmitriy Zaporozhets2015-05-291-0/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Include location.search and location.hash in URL for replaceState Forgot these :blush: See merge request !740
| * | | Include location.search and location.hash in URL for replaceStateRobert Speicher2015-05-291-0/+3
| | | |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-2923-547/+313
|\ \ \ \
| * \ \ \ Merge branch 'rs-teaspoon' into 'master'Dmitriy Zaporozhets2015-05-2923-547/+313
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Teaspoon for Javascript testing Looking to expand our Javascript unit tests, and this gem makes things a bit better in that respect. See https://github.com/modeset/teaspoon See merge request !715
| | * | | Disable Rack::MiniProfiler for /teaspoon pathrs-teaspoonRobert Speicher2015-05-281-1/+2
| | | | |
| | * | | Update jasmine:ci task to use teaspoonRobert Speicher2015-05-281-1/+1
| | | | |
| | * | | Stub ajax in JS specsRobert Speicher2015-05-282-2/+5
| | | | |
| | * | | Remove jasmine-fixture, use teaspoon fixturesRobert Speicher2015-05-289-491/+64
| | | | |
| | * | | Javascripts don't need to require jquery or bootstrap explicitlyRobert Speicher2015-05-285-8/+1
| | | | |
| | * | | teaspoon installRobert Speicher2015-05-282-0/+224
| | | | |
| | * | | Remove jasmine-rails; add teaspoonRobert Speicher2015-05-286-46/+18
| | | | |
View Lorry Controller Status