Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dz-nested-groups-members-page' into 'master' | Dmitriy Zaporozhets | 2017-02-10 | 1 | -0/+8 |
|\ | |||||
| * | Show parent group members for nested groupdz-nested-groups-members-page | Dmitriy Zaporozhets | 2017-02-10 | 1 | -0/+8 |
* | | Merge branch 'issue_26701' into 'master' | Sean McGivern | 2017-02-09 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Remove JIRA closed status iconissue_26701 | Felipe Artur | 2017-02-08 | 1 | -1/+1 |
* | | Merge branch 'dz-fix-route-rename-descendants' into 'master' | Dmitriy Zaporozhets | 2017-02-08 | 1 | -6/+18 |
|\ \ | |||||
| * | | Fix route rename descendants if route.name is blank | Dmitriy Zaporozhets | 2017-02-08 | 1 | -6/+18 |
* | | | Merge branch 'bypass-whitelist-for-external-user' into 'master' | Robert Speicher | 2017-02-08 | 1 | -0/+10 |
|\ \ \ | |/ / |/| | | |||||
| * | | Bypass signup domain validation for external users | Reza Mohammadi | 2017-02-08 | 1 | -0/+10 |
* | | | Merge branch 'dz-refactor-full-path' into 'master' | Dmitriy Zaporozhets | 2017-02-08 | 4 | -34/+70 |
|\ \ \ | |||||
| * | | | Store group and project full name and full path in routes tabledz-refactor-full-path | Dmitriy Zaporozhets | 2017-02-08 | 4 | -34/+70 |
| |/ / | |||||
* | | | Merge branch 'dz-limit-nested-groups' into 'master' | Douwe Maan | 2017-02-08 | 1 | -11/+22 |
|\ \ \ | |||||
| * | | | Limit level of nesting for groupsdz-limit-nested-groups | Dmitriy Zaporozhets | 2017-02-08 | 1 | -11/+22 |
* | | | | Merge branch 'restore-issues_mentioned_but_not_closing' into 'master' | Sean McGivern | 2017-02-08 | 1 | -3/+3 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Remove MergeRequest#closes_issue?; Remove the default parameter value for #ca... | Dongqing Hu | 2017-01-31 | 1 | -3/+3 |
* | | | | Merge branch 'route-map' into 'master' | Robert Speicher | 2017-02-07 | 4 | -101/+166 |
|\ \ \ \ | |||||
| * | | | | Address feedback | Douwe Maan | 2017-02-06 | 3 | -113/+14 |
| * | | | | Update outdated spec | Douwe Maan | 2017-02-06 | 1 | -2/+0 |
| * | | | | Tweak test to verify there are no duplicates | Douwe Maan | 2017-02-06 | 1 | -2/+2 |
| * | | | | Improve performance of finding last deployed environment | Douwe Maan | 2017-02-06 | 3 | -79/+14 |
| * | | | | Add tests | Douwe Maan | 2017-02-06 | 4 | -0/+231 |
* | | | | | Merge branch '26908-add-foreign-keys-to-timelogs' into 'master' | Rubén Dávila Santos | 2017-02-07 | 1 | -0/+28 |
|\ \ \ \ \ | |||||
| * | | | | | Use normal associations instead of polymorphic. | Ruben Davila | 2017-02-07 | 1 | -0/+28 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch '24147-delete-env-button' into 'master' | Rémy Coutable | 2017-02-07 | 2 | -8/+30 |
|\ \ \ \ \ | |||||
| * | | | | | Fix stoppable? | Kamil Trzcinski | 2017-02-07 | 2 | -4/+4 |
| * | | | | | Update changes | Kamil Trzcinski | 2017-02-06 | 1 | -4/+4 |
| * | | | | | Merge remote-tracking branch 'origin/master' into 24147-delete-env-button | Kamil Trzcinski | 2017-02-06 | 70 | -377/+836 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into 24147-delete-env-button | Kamil Trzcinski | 2017-01-24 | 81 | -2608/+5999 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Allow to stop any environment | Kamil Trzcinski | 2016-11-10 | 1 | -6/+28 |
* | | | | | | | | Refresh authorizations when transferring projectsrefresh-permissions-when-moving-projects | Yorick Peterse | 2017-02-07 | 2 | -0/+20 |
| |_|_|/ / / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'ee-1439-read-only-user' into 'master' | Douwe Maan | 2017-02-07 | 1 | -0/+33 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | More backport | Douwe Maan | 2017-02-06 | 1 | -0/+33 |
* | | | | | | | | Update spec | Douwe Maan | 2017-02-06 | 1 | -2/+2 |
| |_|_|_|/ / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'jej-pages-to-ce' into 'master' | Douwe Maan | 2017-02-06 | 2 | -0/+212 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ce | James Edwards-Jones | 2017-02-06 | 4 | -53/+34 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'master' into jej-pages-picked-from-ee | James Edwards-Jones | 2017-02-03 | 9 | -138/+243 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update validates_hostname to 1.0.6 to fix a bug in parsing hexadecimal-lookin... | Nick Thomas | 2017-02-01 | 1 | -1/+7 |
| * | | | | | | | | Fix Rubocop offenses | Grzegorz Bizon | 2017-02-01 | 1 | -7/+7 |
| * | | | | | | | | Mock Dir::exist? in project_spec.rb | Kamil Trzcinski | 2017-01-31 | 1 | -2/+1 |
| * | | | | | | | | Introduce pages_deployed? to Project model | Kamil Trzcinski | 2017-01-31 | 1 | -6/+17 |
| * | | | | | | | | Describe #pages_url instead of :pages_url | Kamil Trzcinski | 2017-01-31 | 1 | -1/+1 |
| * | | | | | | | | Fix the URL of group pages | Kamil Trzcinski | 2017-01-31 | 1 | -0/+33 |
| * | | | | | | | | Update comments | Kamil Trzcinski | 2017-01-31 | 1 | -0/+4 |
| * | | | | | | | | Verify trusted certificate chain | Kamil Trzcinski | 2017-01-31 | 1 | -4/+10 |
| * | | | | | | | | Pages domain model specs | Kamil Trzcinski | 2017-01-31 | 2 | -0/+153 |
* | | | | | | | | | Merge branch 'traits-for-featurs' into 'master' | Robert Speicher | 2017-02-06 | 5 | -7/+3 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add traits for ProjectFeatures to Project factory | Semyon Pupkov | 2017-02-05 | 5 | -7/+3 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Introduce maximum session time for terminal websocket connectionterminal-max-session-time | Adam Niedzielski | 2017-02-06 | 1 | -2/+14 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'rs-event-traits' into 'master' | Rémy Coutable | 2017-02-03 | 2 | -16/+16 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add traits for the different Event types to the Event factoryrs-event-traits | Robert Speicher | 2017-02-01 | 2 | -16/+16 |
* | | | | | | | | Merge branch 'add-issues-to-boards' into 'master' | Fatih Acet | 2017-02-03 | 1 | -35/+4 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | |